dropped unnecessary guards, improved speed