Expading fix to other functionalities