Final version for demonstration prototype