Fixed all code