Tasks working but it need some make up