Working on frustrum
fixing merge conflicts