modified for better looks