Compiled res based on jeff's changes