now working essentially