UPDATED A BIT MORE