Jim suggestions for code limits V2