Various modifications :P