some updates..still not done