Added new logic and fixed a boost error