Added code parts again