[WIP] signature updates