End of day commit. Changes according Brian review and bugfixing