Changed few more things !