1. added more annotations
2. remove lowercase