Added helpers and some to split