Updated code for testing