Changed few more things