First working version without installer