works better now