//rmiranda added