Updated to use a Handler.