optimize a bit more
optimize
disable ics for now