Second Commit with little adjustments