Functionality and speed improvements