Jaya|Fixed WIP cuckes|1700, 1701, 1697, 1705