modified from terminal
merged