changed his design a bit again