Few more changes