updates and now working