Removed some code added some pseudo