Making it compatible with VS