added some inline annotations