working version for first milestone