Updated version.. :pensive: