shift boost and reorder the code a little