* changed messages and method names a bit to be more explicit