Included update functions
merged shane and chris
working on active column