merged changes betw Leo & Rain