* Start to implement quick fixes