Even reduced more code