Beta Version - Further Commit