Switched to two separate methods