Updated for my requirements