added @ and # features