New better version with style