merged
undid davids stuff