features are now working