Some changes here: hacking the hacky ways.