Few more changes but still not perfect