finally had time to finish :)