Adding stuff for 306
Forgot the new stuff