updated by Timir 6.04 PM