ready to implement quick and dirty fixes