design stuff added
merged things