Cleaned up code - removed Vegas