Progress of todays work

Updated according to clients feedback