Added guard code to headers
Added timing code