Final touches for first iteration