Ramisa's changes