more features working, renamed