many changes to get it looking good