Fixed all  issues