Change it this way better