Fixed all changes