Cleaned up functions, new data