updated thanks to ratpac feedback