Extra functions

@xunil