Updated and compiled in one solution