works ok now