Method was changed a bit (previouse version)