updated to work :)