should be working properly now