Update based on given feedback, this is the first release candiate.