some updates after testing and reformatting