Vlad: added more stuff