removed # safties in preperation for testing