Moved constants to the top and added comp function