working version done by team