added features :)