Minor changes. Requires Testing