Ok, this version is definitely better