Merged and changed with felderado