More modern approach now that visual studio has caught up.