Changes after first review from IRC
reflects changes in functionalities