final version for comp