main module improved and waiting on te street added