more correct code:)