moved guest additions to the end