Some efficiency updates