some personal tweaking