Changed from switchcase to independent methods