Fixed timing issue

Fixed timing issue and added some sample annotations