Performance improvement and GUI