marble: modified according xtraeme request