Update to something more realistic due to time and efforts