Additional patch, if there are too many bugs this will have to be redesigned