Incorporating jkondrat's styling - RA-344