fixing Josh's changes