updated for my style