One last bug fix. Its show time