Added timing + finished unfinished parts