#42 change design