Test from github checkpoint

This is the pull-request from the github checkpoint