readded old attributes to keep logic runable