Edit is now fully working!