Adapted to my usage