FULLY EDITED