modified for my habit