my modifications :)