update: works better