Edited a little