Final touches for MVP