Design stuff added