simplified
renamed stuff