merging paint brush and trevon's minor changes