Added end method (intial implementation)