Updates to Main Library