Added nicer looking interface