added todo work for metro class