bug fixing after 3rd presentation