Works now slightly faster