Cleaned up legacy code & added update call