Got rid of need for 2 handlers

im just dumb ;P