CorgiMan's changes + library 248 usage