Adding changes to @skaneria_branch