(WIP) Simplify previos version