decided to just separate the two methods for now