Still need to fix checkbox issue