Addressed most concerns by plaprade