Adding back more features