Fixing up functionality.