No need for this method anymore, just inline the code in the if-else?