Updated with minor issues