Changing code according to Marcos comments