Added Code from Previous Version