code looks a bit better