6th commit. Think it works correctly