#2 Added small improvments