more consts
maybe fix timing problem