final functionality commit