Changed title: Updated stuff in one commit