Adding missing code for 002