Merge with shorthair code and update notes