added conditions to the proper methods for now