Alfa version - few changes