Fixed all the issues