Added feature 1-3