2 more features done