latest changes, kinda works for demo :)