Working version post presentation

Working version post presentation