Updated from muscomp minus the TWEAKS