Revised .h file